bitkeeper revision 1.364 (3f171dea_J-oGqZRBKlB1L8Qsd3KAQ)

xen_kbd.c:
  Ooops... previous checkin incomplete.

diff --git a/xen/drivers/char/xen_kbd.c b/xen/drivers/char/xen_kbd.c
index 782e481c05ed883736884e5e13255e552aa7f19b..01c4283704d96073a03d7f2c24952f8de101eb52 100644 (file)
--- a/xen/drivers/char/xen_kbd.c
+++ b/xen/drivers/char/xen_kbd.c
@@ -197,7 +197,7 @@ static void keyboard_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 #ifdef CONFIG_XEN_ATTENTION_KEY
         if ( !(status & (KBD_STAT_GTO | KBD_STAT_PERR | KBD_STAT_MOUSE_OBF)) )
         {
-            if ( (scancode & (~KBD_SCANCODE_KEYUP_MASK)) == XEN_ATTENTION_KEY )
+            if ( (scancode & ~KBD_SCANCODE_KEYUP_MASK) == XEN_ATTENTION_KEY )
             {
                 xen_attention_key_down = !(scancode & KBD_SCANCODE_KEYUP_MASK);
             } 
@@ -218,7 +218,7 @@ static void keyboard_interrupt(int irq, void *dev_id, struct pt_regs *regs)
         if ( p != NULL )
         {
             kbd_ring_push(status, scancode);
-            cpu_mask |= mark_guest_event(CONSOLE_OWNER, _EVENT_KBD);
+            cpu_mask |= mark_guest_event(p, _EVENT_KBD);
         }
     }
     
@@ -231,7 +231,7 @@ static void keyboard_interrupt(int irq, void *dev_id, struct pt_regs *regs)
     {
         put_task_struct(p);
         guest_event_notify(cpu_mask);
-    }    
+    }
 }